From Conrad Meyer:

From Conrad Meyer:

- Nuke leftover HAVE_EXPAT garbage in google.cc
- Use file prefix to attempt to discover HTML encoding
- Slurp entire HTML input file as discovered encoding, then pass to
  QXmlStreamReader as a QString

xmlgeneric:
- Adds a new function, void xml_readunicode(const QString& str) (does
  what you'd expect -- feeds QString input into the xml parser and runs
  it)